Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 15 Apr 2010 22:43:50 +0000 (22:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 15 Apr 2010 22:43:50 +0000 (22:43 +0000)
commit8fe80af2ff14535e1a0f5c9bb9e67de253d98234
tree4cc213cc2b0195565771d73d85a410c5cbe11b09
parentac7eef14788232e31aa37b88a65f4fd07c6cf6e3
parent05358c50b3d22db201247948f958d1dd46dd26ea
Merge from mainline.